Remove linux-fb leftovers

svn path=/trunk/; revision=18113

diff --git a/ChangeLog b/ChangeLog
index 7646d70697e1bd01d1d785aafee540c44da78b3a..d6290293d38ae735fb8362b1838f14c294d17878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/Makefile.am: Remove linux-fb from DIST_SUBDIRS
+
+       * configure.in: Remove linux-fb parts.
+
 2007-06-12  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkiconview.c (update_text_cell): use PANGO_BREAK_WORD_CHAR

diff --git a/configure.in b/configure.in
index cd50a090a906741e1ac5755138dfb93eeea5bfdd..880d01662f91b71171131e6ab8afb6b66e7897b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -221,13 +221,13 @@ else
   gdktarget=x11
 fi
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32/quartz/directfb]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
        gdktarget=$with_gdktarget)
 
 AC_SUBST(gdktarget)
 case $gdktarget in
-  x11|linux-fb|win32|quartz|directfb) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);;
+  x11|win32|quartz|directfb) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
 esac
 
 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -236,16 +236,6 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
 AC_SUBST(gdktargetlib)
 AC_SUBST(gtktargetlib)
 
-AC_ARG_ENABLE(shadowfb,
-              [AC_HELP_STRING([--disable-shadowfb],
-                              [disable shadowfb support for linux-fb])],,
-              [enable_shadowfb=yes])
-
-AC_ARG_ENABLE(fbmanager,
-              [AC_HELP_STRING([--enable-fbmanager],
-                              [enable framebuffer manager support (GtkFB)])],,
-              enable_fbmanager=no)
-       
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
   GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" 
@@ -1395,24 +1385,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-if test "x$gdktarget" = "xlinux-fb"; then
-  if test x$enable_shadowfb = xyes ; then
-    AC_DEFINE(ENABLE_SHADOW_FB)
-  fi
-
-  if test x$enable_fbmanager = xyes ; then
-    AC_DEFINE(ENABLE_FB_MANAGER)
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
-  else
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-  fi
-  
-  AM_CONDITIONAL(USE_LINUX_FB, true)
-else
-  AM_CONDITIONAL(USE_LINUX_FB, false)
-  AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-fi
-
 if test "x$gdktarget" = "xdirectfb"; then
   DIRECTFB_REQUIRED_VERSION=0.9.24
   AC_MSG_CHECKING(for DirectFB)
@@ -1706,10 +1678,6 @@ if test "x$gdktarget" = "xx11" ; then
 elif test "x$gdktarget" = "xwin32" ; then
   gdk_windowing='
 #define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xlinux-fb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_FB
-#define GDK_NATIVE_WINDOW_POINTER'
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='
 #define GDK_WINDOWING_QUARTZ'
@@ -1772,7 +1740,6 @@ gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
-gdk/linux-fb/Makefile
 gdk/quartz/Makefile
 gdk/directfb/Makefile
 gtk/Makefile
@@ -1803,9 +1770,3 @@ AC_OUTPUT
 
 echo "configuration:
         target: $gdktarget"
-
-if test "x$gdktarget" = "xlinux-fb"; then
-  echo "Warning: The linux-fb GDK target is unmaintained"
-  echo "         and may not work or even compile"
-fi
-

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 50fa1e0235415a1bc15e2398de5afd89f8a430a7..40278085dfb394c673eb82cb467e57cf3c0d2cc6 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk-sections.txt: Remove GDK_WINDOWING_FB
+       * gtk/Makefile.am:
+       * gtk/gtk-docs.sgml:
+       * gtk/compiling.sgml:
+       * gtk/building.sgml: Remove linux-fb references
+
 2007-06-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk-update-icon-cache.xml: Document --validate

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index d0828990f5ad747e12c96c1d46aa0740e06ec971..0da3b962e46c906ba7708e83be5c8e225399f114 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -55,7 +55,6 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_FB
 
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index ecd8b94d415c02683af61999021b7f77c6549c4a..e01054f5d8615bf7746af1a7ee883c3a823f058b 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -122,7 +122,6 @@ content_files =                                     \
        changes-2.0.sgml                        \
        compiling.sgml                          \
        directfb.sgml                           \
-       framebuffer.sgml                        \
        glossary.xml                            \
        migrating-checklist.sgml                \
        migrating-GtkAction.sgml                \

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index ffbb43c49c1e9fb91cf3c9a9b9cffceee7d4bc8d..82362fd8957665ed6c50c2100c559c33b1ceee22 100644 (file)
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -344,11 +344,7 @@ How to compile GTK+ itself
             <arg>--with-xinput=[no|yes]</arg>
           </group>
          <group>
-           <arg>--with-gdktarget=[x11|linux-fb|win32|quartz|directfb]</arg>
-         </group>
-         <group>
-           <arg>--disable-shadowfb</arg>
-           <arg>--enable-shadowfb</arg>
+           <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
          </group>
        </cmdsynopsis>
       </para>
@@ -542,16 +538,6 @@ How to compile GTK+ itself
        </para>
       </formalpara>
 
-      <formalpara>
-       <title><systemitem>--disable-shadowfb</systemitem> and
-         <systemitem>--enable-shadowfb</systemitem></title>
-
-       <para>
-         Toggles shadow framebuffer support for the linux-fb target, 
-         if selected.
-       </para>
-      </formalpara>
-
     </refsect1>
 
 </refentry>

diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml
index 29aa1463f0015fa8cc1f73ab141d9e97b98e7b5a..d5b89dea8550f27097eb638c6a556c5f3e483b50 100644 (file)
--- a/docs/reference/gtk/compiling.sgml
+++ b/docs/reference/gtk/compiling.sgml
@@ -42,14 +42,6 @@ $ cc `pkg-config --cflags --libs gtk+-2.0` hello.c -o hello
 </programlisting>
 </para>
 
-<para>
-To compile a GTK+ program for the framebuffer, use the
-"gtk+-linux-fb-2.0" package name instead of "gtk+-2.0":
-<programlisting>
-$ cc `pkg-config --cflags --libs gtk+-linux-fb-2.0` hello.c -o hello
-</programlisting>
-</para>
-
 <para>
 If you want to make sure that your program doesn't use any deprecated 
 functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b8c2e3bea1cbf91220a52a682937b1830444b6e6..dfa7bd4cda16797eb39942ac7c0b91852497f736 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -205,7 +205,6 @@
 <!ENTITY gtk-Running SYSTEM "running.sgml">
 <!ENTITY gtk-Resources SYSTEM "resources.sgml">
 <!ENTITY gtk-Windows SYSTEM "windows.sgml">
-<!ENTITY gtk-Framebuffer SYSTEM "framebuffer.sgml">
 <!ENTITY gtk-X11 SYSTEM "x11.sgml">
 <!ENTITY gtk-OSX SYSTEM "osx.sgml">
 <!ENTITY gtk-DirectFB SYSTEM "directfb.sgml">
@@ -317,7 +316,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     &gtk-Windows;
     &gtk-OSX;
     &gtk-DirectFB;
-    &gtk-Framebuffer;
     &gtk-Resources;
     &gtk-Questions;
   </part>

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index da3e9a92733fe5bebda98de0b0157a7ec0211215..e22c318273e9514d6094b3f1a974582d67eb1488 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/gdk
 
 SUBDIRS = $(gdktarget)
-DIST_SUBDIRS = linux-fb win32 x11 quartz directfb
+DIST_SUBDIRS = win32 x11 quartz directfb
 
 EXTRA_DIST =                   \
        keynames.txt            \
@@ -152,11 +152,6 @@ libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
 
-libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \
-  $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
-
 libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
@@ -210,7 +205,7 @@ endif
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
 
 MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
   gdkmarshalers.h gdkmarshalers.c